From df1f4e57edc7bc47760ff6e67d5ae0be55712ea3 Mon Sep 17 00:00:00 2001 From: robertl Date: Sat, 1 Jul 2006 19:45:57 +0000 Subject: [PATCH] Add 103 Garmin symbols to tables and doc from new protocol spec. --- garmin_tables.c | 95 ++++++++++++++++++++++++++++++++ mkicondoc.c | 6 +- xmldoc/chapters/garmin_icons.xml | 91 ++++++++++++++++++++++++++++++ 3 files changed, 191 insertions(+), 1 deletion(-) diff --git a/garmin_tables.c b/garmin_tables.c index b054747b0..5e0811f9c 100644 --- a/garmin_tables.c +++ b/garmin_tables.c @@ -216,6 +216,101 @@ icon_mapping_t garmin_icon_table[] = { { 159, 188, "Weed Bed" }, { 160, 189, "Dropoff" }, { 161, 190, "Dock" }, + + /* New in Garmin protocol spec from June 2006. Extracted from + * spec and fed through some horrible awk to add ones we didn't + * have before but normalized for consistency. */ + { -1, 8359, "Asian Food" }, + { -1, 8296, "Blue Circle" }, + { -1, 8299, "Blue Diamond" }, + { -1, 8317, "Blue Letter A" }, + { -1, 8318, "Blue Letter B" }, + { -1, 8319, "Blue Letter C" }, + { -1, 8320, "Blue Letter D" }, + { -1, 8341, "Blue Number 0" }, + { -1, 8342, "Blue Number 1" }, + { -1, 8343, "Blue Number 2" }, + { -1, 8344, "Blue Number 3" }, + { -1, 8345, "Blue Number 4" }, + { -1, 8346, "Blue Number 5" }, + { -1, 8347, "Blue Number 6" }, + { -1, 8348, "Blue Number 7" }, + { -1, 8349, "Blue Number 8" }, + { -1, 8350, "Blue Number 9" }, + { -1, 8302, "Blue Oval" }, + { -1, 8305, "Blue Rectangle" }, + { -1, 8308, "Blue Square" }, + { -1, 8351, "Blue Triangle" }, + { -1, 8254, "Border Crossing (Port Of Entry)" }, + { -1, 182, "Bottom Conditions" }, + { -1, 8360, "Deli" }, + { -1, 8228, "Elevation point" }, + { -1, 8229, "Exit without services" }, + { -1, 16398, "First approach fix" }, + { -1, 8250, "Gambling/casino" }, + { -1, 8232, "Geographic place name, land" }, + { -1, 8230, "Geographic place name, Man-made" }, + { -1, 8231, "Geographic place name, water" }, + { -1, 8295, "Green circle" }, + { -1, 8313, "Green Letter A" }, + { -1, 8315, "Green Letter B" }, + { -1, 8314, "Green Letter C" }, + { -1, 8316, "Green Letter D" }, + { -1, 8331, "Green Number 0" }, + { -1, 8332, "Green Number 1" }, + { -1, 8333, "Green Number 2" }, + { -1, 8334, "Green Number 3" }, + { -1, 8335, "Green Number 4" }, + { -1, 8336, "Green Number 5" }, + { -1, 8337, "Green Number 6" }, + { -1, 8338, "Green Number 7" }, + { -1, 8339, "Green Number 8" }, + { -1, 8340, "Green Number 9" }, + { -1, 8301, "Green Oval" }, + { -1, 8304, "Green Rectangle" }, + { -1, 8352, "Green Triangle" }, + { -1, 16385, "Intersection" }, + { -1, 8201, "Intl freeway hwy" }, + { -1, 8202, "Intl national hwy" }, + { -1, 8361, "Italian food" }, + { -1, 8248, "Large exit without services" }, + { -1, 8247, "Large Ramp intersection" }, + { -1, 16399, "Localizer Outer Marker" }, + { -1, 16400, "Missed approach point" }, + { -1, 16386, "Non-directional beacon" }, + { -1, 168, "Null" }, + { -1, 180, "Open 24 Hours" }, + { -1, 8222, "Ramp intersection" }, + { -1, 8294, "Red circle" }, + { -1, 8309, "Red Letter A" }, + { -1, 8310, "Red Letter B" }, + { -1, 8311, "Red Letter C" }, + { -1, 8312, "Red Letter D" }, + { -1, 8321, "Red Number 0" }, + { -1, 8322, "Red Number 1" }, + { -1, 8323, "Red Number 2" }, + { -1, 8324, "Red Number 3" }, + { -1, 8325, "Red Number 4" }, + { -1, 8326, "Red Number 5" }, + { -1, 8327, "Red Number 6" }, + { -1, 8328, "Red Number 7" }, + { -1, 8329, "Red Number 8" }, + { -1, 8330, "Red Number 9" }, + { -1, 8300, "Red Oval" }, + { -1, 8303, "Red Rectangle" }, + { -1, 8353, "Red Triangle" }, + { -1, 8362, "Seafood" }, + { -1, 8194, "State Hwy" }, + { -1, 8363, "Steak" }, + { -1, 8223, "Street Intersection" }, + { -1, 16401, "TACAN" }, + { -1, 183, "Tide/Current PRediction Station" }, + { -1, 191, "U Marina" }, + { -1, 8193, "US hwy" }, + { -1, 193, "U stump" }, + { -1, 16387, "VHF Omni-range" }, + { -1, 16397, "VOR-DME" }, + { -1, 16396, "VOR/TACAN" }, { -1, -1, NULL }, }; diff --git a/mkicondoc.c b/mkicondoc.c index 1e2d6298f..c099dc5db 100644 --- a/mkicondoc.c +++ b/mkicondoc.c @@ -8,12 +8,16 @@ tbl_ent(int n, ...) char *t; va_list args; va_start(args, n); - +#if 0 for (i = 0; i < n; i++) { t = va_arg(args, char *); printf("%s%s", i > 0 ? "," : "", t); } +#else + t = va_arg(args, char*); + printf("%s", t); +#endif printf("\n"); va_end(args); diff --git a/xmldoc/chapters/garmin_icons.xml b/xmldoc/chapters/garmin_icons.xml index 9b0ef3a01..8c93e6393 100644 --- a/xmldoc/chapters/garmin_icons.xml +++ b/xmldoc/chapters/garmin_icons.xml @@ -18,6 +18,7 @@ formats. Airport Amusement Park Anchor Prohibited +Asian Food Ball Park Bank Bar @@ -25,7 +26,29 @@ formats. Beacon Bell Bike Trail +Blue Circle +Blue Diamond +Blue Letter A +Blue Letter B +Blue Letter C +Blue Letter D +Blue Number 0 +Blue Number 1 +Blue Number 2 +Blue Number 3 +Blue Number 4 +Blue Number 5 +Blue Number 6 +Blue Number 7 +Blue Number 8 +Blue Number 9 +Blue Oval +Blue Rectangle +Blue Square +Blue Triangle Boat Ramp +Border Crossing (Port Of Entry) +Bottom Conditions Bowling Bridge Building @@ -67,6 +90,7 @@ formats. Crossing Dam Danger Area +Deli Department Store Diamond, Blue Diamond, Green @@ -76,9 +100,12 @@ formats. Dock Drinking Water Dropoff +Elevation point Event Cache Exit +Exit without services Fast Food +First approach fix Fishing Area Fishing Hot Spot Facility Fitness Center @@ -87,14 +114,36 @@ formats. Flag, Green Flag, Red Forest +Gambling/casino Gas Station Geocache Geocache Found +Geographic place name, land +Geographic place name, Man-made +Geographic place name, water Ghost Town Glider Area Golf Course +Green circle Green Diamond +Green Letter A +Green Letter B +Green Letter C +Green Letter D +Green Number 0 +Green Number 1 +Green Number 2 +Green Number 3 +Green Number 4 +Green Number 5 +Green Number 6 +Green Number 7 +Green Number 8 +Green Number 9 +Green Oval +Green Rectangle Green Square +Green Triangle Heliport Horn Hotel @@ -102,9 +151,16 @@ formats. Hunting Area Ice Skating Information +Intersection +Intl freeway hwy +Intl national hwy +Italian food +Large exit without services +Large Ramp intersection Levee Light Live Theater +Localizer Outer Marker Locationless (Reverse) Cache Lodging Man Overboard @@ -114,6 +170,7 @@ formats. Mile Marker Military Mine +Missed approach point Movie Theater Multi-Cache Museum @@ -131,7 +188,10 @@ formats. Navaid, White Navaid, White/Green Navaid, White/Red +Non-directional beacon +Null Oil Field +Open 24 Hours Parachute Area Park Parking Area @@ -146,8 +206,27 @@ formats. Post Office Private Field Radio Beacon +Ramp intersection +Red circle Red Diamond +Red Letter A +Red Letter B +Red Letter C +Red Letter D +Red Number 0 +Red Number 1 +Red Number 2 +Red Number 3 +Red Number 4 +Red Number 5 +Red Number 6 +Red Number 7 +Red Number 8 +Red Number 9 +Red Oval +Red Rectangle Red Square +Red Triangle Reef Residence Restaurant @@ -157,6 +236,7 @@ formats. Scales Scenic Area School +Seafood Seaplane Base Shipwreck Shopping Center @@ -168,18 +248,29 @@ formats. Small City Soft Field Stadium +State Hwy +Steak +Street Intersection Summit Swimming Area +TACAN Tall Tower Telephone +Tide/Current PRediction Station Toll Booth TracBack Point Trail Head Truck Stop Tunnel +U Marina +U stump Ultralight Area Unknown Cache +US hwy +VHF Omni-range Virtual cache +VOR-DME +VOR/TACAN Water Hydrant Waypoint Webcam Cache -- 2.30.2